don't leak 'filename' field memory when loading more than one file into

2007-11-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkbuilder.c: don't leak 'filename' field memory when loading
        more than one file into the same GtkBuilder instance. Noticed by
        Ryan Lortie.

svn path=/trunk/; revision=18973

diff --git a/ChangeLog b/ChangeLog
index 0a4323d70010ad9bd7a0ec67225ba36a5b5ef122..5c2da1ff5806649a6a25cbb61b4b8ea09917a17f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkbuilder.c: don't leak 'filename' field memory when loading
+       more than one file into the same GtkBuilder instance. Noticed by
+       Ryan Lortie.
+
 2007-11-08  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkbuildable.h: include <glib.h> instead of <glib/gmarkup.h>

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index e5b51cab9ad73c624f1dd550647bcd9cd465b499..a5c9fd683feb23a5b77512af9b07dc1494f739d2 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -660,6 +660,7 @@ gtk_builder_add_from_file (GtkBuilder   *builder,
       return 0;
     }
   
+  g_free (builder->priv->filename);
   builder->priv->filename = g_strdup (filename);
 
   _gtk_builder_parser_parse_buffer (builder, filename,
@@ -704,6 +705,7 @@ gtk_builder_add_from_string (GtkBuilder   *builder,
 
   tmp_error = NULL;
 
+  g_free (builder->priv->filename);
   builder->priv->filename = g_strdup (".");
 
   _gtk_builder_parser_parse_buffer (builder, "<input>",